diff --git a/system/database/drivers/sqlsrv/sqlsrv_driver.php b/system/database/drivers/sqlsrv/sqlsrv_driver.php
index e9c3917..1169071 100644
--- a/system/database/drivers/sqlsrv/sqlsrv_driver.php
+++ b/system/database/drivers/sqlsrv/sqlsrv_driver.php
@@ -16,7 +16,7 @@
 // ------------------------------------------------------------------------
 
 /**
- * MS SQL Database Adapter Class
+ * SQLSRV Database Adapter Class
  *
  * Note: _DB is an extender class that the app controller
  * creates dynamically based on whether the active record
@@ -28,7 +28,7 @@
  * @author		ExpressionEngine Dev Team
  * @link		http://codeigniter.com/user_guide/database/
  */
-class CI_DB_mssql_driver extends CI_DB {
+class CI_DB_sqlsrv_driver extends CI_DB {
 
 	var $dbdriver = 'sqlsrv';
 
diff --git a/system/database/drivers/sqlsrv/sqlsrv_forge.php b/system/database/drivers/sqlsrv/sqlsrv_forge.php
index 70b20ec..cc88ec5 100644
--- a/system/database/drivers/sqlsrv/sqlsrv_forge.php
+++ b/system/database/drivers/sqlsrv/sqlsrv_forge.php
@@ -16,13 +16,13 @@
 // ------------------------------------------------------------------------
 
 /**
- * MS SQL Forge Class
+ * SQLSRV Forge Class
  *
  * @category	Database
  * @author		ExpressionEngine Dev Team
  * @link		http://codeigniter.com/user_guide/database/
  */
-class CI_DB_mssql_forge extends CI_DB_forge {
+class CI_DB_sqlsrv_forge extends CI_DB_forge {
 
 	/**
 	 * Create database
diff --git a/system/database/drivers/sqlsrv/sqlsrv_result.php b/system/database/drivers/sqlsrv/sqlsrv_result.php
index 058c6f4..4582003 100644
--- a/system/database/drivers/sqlsrv/sqlsrv_result.php
+++ b/system/database/drivers/sqlsrv/sqlsrv_result.php
@@ -16,7 +16,7 @@
 // ------------------------------------------------------------------------
 
 /**
- * MS SQL Result Class
+ * SQLSRV Result Class
  *
  * This class extends the parent result class: CI_DB_result
  *
@@ -24,7 +24,7 @@
  * @author		ExpressionEngine Dev Team
  * @link		http://codeigniter.com/user_guide/database/
  */
-class CI_DB_mssql_result extends CI_DB_result {
+class CI_DB_sqlsrv_result extends CI_DB_result {
 
 	/**
 	 * Number of rows in the result set
diff --git a/system/database/drivers/sqlsrv/sqlsrv_utility.php b/system/database/drivers/sqlsrv/sqlsrv_utility.php
index 48ecbc7..13a1850 100644
--- a/system/database/drivers/sqlsrv/sqlsrv_utility.php
+++ b/system/database/drivers/sqlsrv/sqlsrv_utility.php
@@ -16,13 +16,13 @@
 // ------------------------------------------------------------------------
 
 /**
- * MS SQL Utility Class
+ * SQLSRV Utility Class
  *
  * @category	Database
  * @author		ExpressionEngine Dev Team
  * @link		http://codeigniter.com/user_guide/database/
  */
-class CI_DB_mssql_utility extends CI_DB_utility {
+class CI_DB_sqlsrv_utility extends CI_DB_utility {
 
 	/**
 	 * List databases